Merge pull request #3 from simmianand/master

Applied changes in billing.py and timeline.py
Added test package to setup.py