tomgey Merge pull request #14 from NikolaiVChr/master