Removed unused headers
Removed depreciated code
Merge pull request #16 from JeroenMathon/Development

Development