fixed soooooooome shit....
rebase
Merge pull request #3 from soupy031/jb-devel-mr2-release

One More Time FFFFAAACCCEEEPPPPAAALLLLLMMMMMM!!!!!!
one more time.. time oh give me time..