issues #33 #46
Merge pull request #49 from eprogramming/master

issues #33 #46