cleaned code up
Merge branch 'issue1' into dev