Merge pull request #23 from eprogramming/master

hail