fixing merge problem from extended keys branch
Merge pull request #106 from fmtvp/extendedkeys-merge-fix

extended keys - fixes 104