Merge pull request #1 from marusack/master

Master