fixes #12
Merge branch 'fuerte-devel' into fuerte