Merge pull request #1 from mbeall/master

Various improvements
Merge pull request #2 from starverte/dev

Candlelight 0.1.0
Merge pull request #1 from starverte/master

Merge from master