Add godeps
Update code for better operation