Merge pull request #8 from nicholasvmoore/development

Development
Merge branch 'development'
??
???
fixing ubuntu
fixing for merge