Merge pull request #19 from SaveTheRbtz/master

From Cambodia with love.