Merge pull request #2 from neskola/master

Remember to pull this