Work

continuing work
Merge pull request #7 from ccubed/master

Work