finished functionality
Merge pull request #3 from troychurch/master

finished functionality