Merge pull request #7 from timothycrosley/feature/fix-issues

Feature/fix issues
Merge in latest changes from develop