Add minor fixes
Merge pull request #10 from jtapia/2-2-stable

Add minor fixes