merging
Merge branch 'master' of https://github.com/ufieeehw/IEEE2015
various updates
merged