added platforms along with some bugs :(
Merge branch 'master' into gh-pages