Merge pull request #1 from coderel/master

Updating fork with original
dec16 2014
small change
Flow completed, Now UI left
Flow completed, Now UI left
Merge pull request #3 from rockfight/master

Workflow completed