updated 11/03/2014
updated 11/03/2014
Merge branch 'master' of https://github.com/wmoore28/epics

updated 11/03/2014
Merge branch 'master' of https://github.com/levon-hakobyan/epics into hotfix-v0.2.1