Small tweaks
Merge pull request #99 from FWAJL/Development

Small tweaks