Merge pull request #105 from XhmikosR/master

Various updates.