Merge pull request #2 from Galbar/master

merging
Merge branch 'master' into gh-pages