28-bitca-andrei

- Fixed some bugs on issue #21 
- Completed issue #28