Fixed copyright comment alignment.
Replaced tabs with spaces in template files.
Fixed a deprecated method warning.
Merge pull request #22 from karolkozub/cleanup

Cleanup