Merge pull request #56 from mina86/a