Merge branch 'master' of https://github.com/daynedavis/P2PGM into dayne
Merge branch 'master' of https://github.com/daynedavis/P2PGM into dayne
added getTags function
fixed conflicts