Merge pull request #1 from ajatix/master

Second