Code abstractions and optimisation

- Code abstractions and optimisation (split the method render() - some
stuff abstracted to new method mergeMatrix()
- Version bumped to 0.0.5
Code cleanup

- Code cleanup
- Version bump to 0.0.5
Updated changelog

Changelog updated.
Merge pull request #7 from kongondo/dev

Dev