Added a few things
Nightly 0.0.1a2
Merge remote-tracking branch 'origin/master'