Merge pull request #98 from XhmikosR/master

Miscellaneous updates.