dev up
Merge pull request #1 from kimspark/develov

dev up