Bug fixing.
Merge branch 'master' of github.com:aureliano/theotokos