Added some basic features
Merge branch 'BasicFeatures' of https://github.com/SuprDewd/spandex