clean up
Merge pull request #118 from darkowlzz/integration1.5

clean up