Merge pull request #1 from FezVrasta/master

Merge new commits