Merge pull request #2 from almostalive/master