Merge pull request #1 from kormaco/master

Master