Merge pull request #1 from ajatix/master

Second
Merge branch 'master' into gh-pages