Merge pull request #2 from ctestama/master

Nearly Finished Product merge