Merge pull request #9 from shulolo/master

damien