Merge pull request #39 from prog4fun/master

Not pushed to staging. Pushed to master by mistake.