Merge pull request #1 from jedisct1/master

-