fixed all functionality
Merge pull request #43 from slwaller/master

fixed all functionality