Merge pull request #1 from alexames/master

Sync
Merge pull request #2 from alexames/master

Sync
Merge pull request #31 from PixelOrange/master

sync