Merged jhgamboa-master with latest changes
Merge branch 'jhgamboa-master'