Merge pull request #100 from eprogramming/master

to complete the issue #57