Merge pull request #42 from makkrnic/master