master 1.5.258
Merge pull request #64 from axrami/gh-pages

master 1.5.258