P990: Take the right branch

We should sync with your latest branch :-D
Merge pull request #1 from tonyp/firtecy

P990: Take the right branch