Merge pull request #3 from gallantd/working

Working
Merge branch 'working'
about fixes