Merge pull request #1 from thedancomplex/master

merge with working
Merge pull request #1 from hubo/master

Merge pull request #1 from thedancomplex/master