Fixing fillRect's
iss5 closed
Merge branch 'development'
Merge branch 'master' into gh-pages