version 2
merge v2 to master so I can tag and access from bower