Merge pull request #1 from thedancomplex/master

merge with working