Add back in features overwritten from pull
Merge pull request #5 from barchart/develop

Add back in features overwritten from pull