Merge branch JIFX into master
Merge pull request #2 from ervteng/store-and-forward

Merge branch JIFX into master