Merge pull request #4 from sleeplessinc/master