bugfixed
Merge branch 'ericlinj'