Develop - RMT-176

1. RMT-176
2. Code Cleanup
3. Debian packaging (Adam)