Merge pull request #1 from FezVrasta/master

Merging changes