Code cleanings & minor features
Merge pull request #1 from S3b0/development

Code cleanings & minor features