Merge pull request #13 from Eegras/master

Adding some stuff to working branch.
Fixed #12 and #15.
Merge pull request #15 from Eegras/gh-pages

Merging in latest changes.