Version 0.5.4

- Merged in changes from Select Box Link
- Code clean-up